# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1153.65.1+1.1153.45.3 -> 1.1153.65.2 # kernel/sys.c 1.49 -> 1.50 # include/asm-ppc/unistd.h 1.23.1.3 -> 1.27 # include/linux/pci.h 1.90.1.17 -> 1.97 # Makefile 1.410.1.12 -> 1.420 # kernel/kallsyms.c 1.11.1.1 -> 1.13 # diff -Nru a/kernel/sys.c b/kernel/sys.c --- a/kernel/sys.c Mon Sep 22 13:02:51 2003 +++ b/kernel/sys.c Mon Sep 22 13:02:51 2003 @@ -456,11 +456,8 @@ #ifdef CONFIG_SOFTWARE_SUSPEND case LINUX_REBOOT_CMD_SW_SUSPEND: - if (!software_suspend_enabled) { - unlock_kernel(); - return -EAGAIN; - } - software_suspend(); + if (!pm_suspend(PM_SUSPEND_DISK)) + break; do_exit(0); break; #endif